Revert 61e0b9b..a8dd7bc

This rolls back to commit 61e0b9b8e3efd3080da90375bd6f66f1b8cafd39.