Revert 64e7bcc..77bb1d5

This rolls back to commit 64e7bcc26269c8a41e19a332d7f632c08e8f5893.