Reverted hidden logic - References #94