Revert to a66f0382d34a75d71e152e2fa6d56feeb2dcc8fa