Revert f3408c0..52d0090

This rolls back to commit f3408c059c417019795669d0bb35d3f3b7e6ebc4.