Revert to c3ae107dcf2fa398b9d766c9597f06e8998c8580