Revert "Mako cleanup"

This reverts commit 9cfb0a85085b156aefeae80a8d7204f6219868b3.