Revert 5574e9e..e5ea72e

This rolls back to commit 5574e9eb2f5eb9f326bc1ad6fec3edc4e3baf4d8.