Revert 648f3bc..38913e9

This rolls back to commit 648f3bcb5f8fe151742d57cd381c52c24bed47e2.