Reverted "Minor Changes" Commit