Revert d894329..f55d5b3

This rolls back to commit d8943296c1240a1754f5a76c6547e872dd4c5035.