Revert d9360d9..cb8e36b

This rolls back to commit d9360d92fd164d04a45a2f5681cd5f951401985d.