Reverting this change since it seems to break diagnostics