Revert change for #428 that broke build