The ol’ switcharoo (removing broken code for a merge)