Revert #4 for set in BaseController