Revert 615e351..1f7bc53

This rolls back to commit 615e3518689010d2228da9af08dfaa48ac8da682.