Manual revert of d2ae35d