Revert d8eeca4..9cca78b

This rolls back to commit d8eeca4ccaeac41616d9ceef57e7fa1b3603fc8e.