Handle breaking padrino change. Closes #1349