revert #712 quadicon locator

Had to revert #712 as it was hitting this bug...

https://bugzilla.redhat.com/show_bug.cgi?id=1053097
Merge pull request #713 from dajohnso/revert_quad_locator

revert #712 quadicon locator