Revert ac257fa..7f5d3c0

This rolls back to commit ac257fa137a3778d7e11328c2ea92ab79fc5dfe2.