Re-Revert to include dpickem's previous change