Revert e266f43..24bc1b4

This rolls back to commit e266f43b2b21534e79922fbe5ce44ade9c9ade10.