Revert ca2c249..8711dfb

This rolls back to commit ca2c24932192adfacefb6ea06fc879c3fcffba61.