Revert 7597bd4..3ed7981

This rolls back to commit 7597bd4d26aa81f22878febdcd05ec324d5b2077.