reverted changes made for #1