Revert 82c6dc7..4600797

This rolls back to commit 82c6dc74e4980bbc923128e6f709e71f2654f9ce.