Revert "Merge pull request #229 from DraggonZ/TRUNK-3482"

This reverts commit 41822c85993565235871009d3f6382ed4de59132, reversing
changes made to 24b866ce98d89a5b81d2600f53047bed13446fe9.