Revert b5a6561, 5ff45aa and 90279bb.