Revert 3b20409..907b1c7

This rolls back to commit 3b20409d991e86a42a65a2da322effe79c3fa0f3.