Revert dbc4052..49ae988

This rolls back to commit dbc405226bb932e180b2d8abcd97245a0c7f7b9f.