Removed OS check. DO NOT MERGE.