Merge pull request #2258 from JosJuice/revert-2256-Dolphin-Pro Revert "Dolphin Pro" April Fools joke that never should've been merged
