Revert fix that caused 500 error