Revert fd50fcc..71c834f

This rolls back to commit fd50fccb69a9a528fd847ec8d3925249d58a4f59.