Revert 01f00b9..1a5e6d7

This rolls back to commit 01f00b974c9f22fd7ec652b187ab01fd87e8538d.