Revert 30b8b5a..d4cfad9

This rolls back to commit 30b8b5a0a40d19f4e8b9d70f0230b491a6d9c359.