Revert to b6fa6b3