Revert "Include upstream GitHub Pull Request #352 to fix RC bug"

This reverts commit 8f1f5633eb2c2cdaec7691021f6d495772459448.