#553 revert changes
Merge pull request #701 from adamralph/553

#553 revert changes