Revert "Revert "2014/11/25 @flightsider""

This reverts commit c51a3a85db32105bb1a6e0bdd8700a8624c7e105.