Reverted #374 fix - caused infiniloop
.