backing rails4 syntax out of master

didn't intend to push this change out to the master branch