Revert ed1d9e9..17adc31

This rolls back to commit ed1d9e9a2cf65707a553d1948a058968bc0665e1.