Revert 82032d2..f595e5a

This rolls back to commit 82032d224f753106728f433e25c5f53d7540fe64.