Removed code from "master" to avoid confusion