Commit to reverse changes related to issue #35 that broke build