Revert 2e61a0b..0a0f79d

This rolls back to commit 2e61a0b4cbd96b626309bf4ab85f6f43e4215090.