Revert 58a2b76..9f71317

This rolls back to commit 58a2b76c57f311360dad600c8d9e1e49dec1f2a2.