Revert efb5808..3191e71

This rolls back to commit efb5808e3500a4cd5e717b847b2158c988130f6d.