Revert 96c96fa..4f91aed

This rolls back to commit 96c96fac6d07bca48a954ae8df59f2fdef87dad1.