Revert fix for #1043

Revert fix for #1043