Revert c80842d..ce2ce2d

This rolls back to commit c80842d094f7efd24b8a249fec51fedcf3ac9c75.