Revert 88148e2..9a10fad

This rolls back to commit 88148e2a9b1e8aa7e4e569b4a8b4079f7c5ffd91.