WINDUP-190: Reverted
Merge pull request #196 from lincolnthree/WINDUP-190-revert

WINDUP-190: Reverted