Revert commit a5969d6eef7a27df28d1dd04214c6b773b8de9da