Revert 2265d8a