Revert 0621867..f8381c4

This rolls back to commit 0621867488f231d13c0008a4d5d52bb1873830e9.