Revert "Fix for mako"

This reverts commit e2c4c4604074a43d970eb22c1b0a452a593f6c30.