Reverting pull request 240