#1009 unintended changes removed