Revert ac17384..d61a9ba

This rolls back to commit ac1738497ac55908f5de32a7b0ebdbf232f24c30.