Revert a4d653d..dd77132

This rolls back to commit a4d653d4a3e5d99f4824873ab79cb06e90ac1c25.
Still rock n' roll to me