Reverted changes to current master that have been accidentally imported and have nothing to do with the positionable tag implementation.