Revert "2014-09-12-15-19"

This reverts commit fdc17c82dd11960202519af8dd22ac0e96aaf55b.