Revert a91aebc..815b24b

This rolls back to commit a91aebc0e367a141d9a5af851d0312a7e808be03.