Revert previous commit with deprecation warning.
Improvements on own bindonce directives.