Revert de5d8cd..74f8c92

This rolls back to commit de5d8cd543fc4907ce2a84942c1deab6d8e90ede.