Revert 3d713b2..a0543bf

This rolls back to commit 3d713b29b672e4c3fc0e591d0fe67ed9810a5554.