Revert "small improvement"

This reverts commit c1609c37b37ac75fbfb605aaf05c596c86879914.
Merge branch 'master' into rails4