Revert "FIX: issue #626 (Compiler error on routine)"

This reverts commit 22e7461501d549ff30f836e60b991f1f7b3a9d39.