Had to revert some of these patches for haml compat