Revert 2fa5efe..b28d0cb

This rolls back to commit 2fa5efed638b85cda0fcf85aceb3583f9c9b5e66.