Reverted 6ea730c203 because it breaks camera.