Undoing previous commits, as they caused build issues from merge with floored.github.com.