Revert fed4233..6ee2a81

This rolls back to commit fed4233c2fb9026c6a43b6950bcc38da4bb0e950.