Revert 595a54f..102a36b

This rolls back to commit 595a54f99e5017b27e8dd45f539fbcb6eb58c957.