Revert 0655aaf..447a0e5

This rolls back to commit 0655aaf99e0556606d9ca1b149b9df99a65ed38e.