Reverted code back to old style.