Revert "Merge pull request #1149 from tuff-ghost/issue_3528"

This reverts commit 4a7ecf2d9c955bddda5860b5ff15d230624b508e, reversing
changes made to 995e5d1c61034a80813045241bf61b61fc25f68b.