revert change that was supposed to be in rails4 branch