Revert c4924fc..7bb4dc8

This rolls back to commit c4924fc82f73fd5d249f726b1e873b7e76b4079b.