Reverted stupid static removals... let's actually debug the problem!