Revert 5ecaa60..39ad5a0

This rolls back to commit 5ecaa6094bb09cecb1b42771a73a08ccc8961c05.