#703: Remove workaround and throw