Revert 0dc84b1..a5e1d80

This rolls back to commit 0dc84b19d5ce8d2d6b999f0e18b82143d0117370.