Revert 9268044..e374a00

This rolls back to commit 9268044a30398deb19acd8e793096b89d714f4b9.