Partial revert of e7c7c5b