reverting previous changes

They were causing server 500 errors.