Revert "Merge pull request #2390 from phptek/2389"

This reverts commit 58da57dd1b6b47d7e2e5a8ab109268bbae8e1c3b, reversing
changes made to 8864256601bb295f8a52ad2eea04c4e1f8087c1b.
Merge pull request #2411 from simonwelsh/circ_ref

Revert "Merge pull request #2390 from phptek/2389"