Revert bab9156..1a19250

This rolls back to commit bab915622576bb070e948d1ccc6f78b513f6cf7a.