Revert two changes that shouldn't have been pushed in aab083a66a52f5f8d65a83e64648ff44b7fc2533