reverting... fix for #276