Revert ef4246b..ff5bcda

This rolls back to commit ef4246be4f09066e9c8c8e84fc7a339d84b98a82.