Revert ae188a4..8dd3e4b

This rolls back to commit ae188a4e9638083977f0c4fcfbb97f87cbc785b3.