Revert c03a653..557f248

This rolls back to commit c03a6532585ebf19f74a62e0c8d80611dcb2cc52.