Remove a Padrino hack. They fixed the bug upstream and now our hack is the problem. Closes #1327