Revert 9889683..09d9c88

This rolls back to commit 9889683d27b140c6151936cd3641ace65aced917.