Revert c84816c..9ac80ca

This rolls back to commit c84816c2699b957449be0200e16563c4f0b699fe.