Revert 279588e..03804a4

This rolls back to commit 279588eb4bad301be06379f1baa5c1c4c8a4a77f.