Revert "Second pull request"

Reverts rasave01/sp2-cw3-2014#2