Revert 992e2ba..1ec9091

This rolls back to commit 992e2baf024b61b33841a591005d391f30c3a66d.