Closes #920; Fixes #480 (closed).
This pull request overrides #920 in an effort to keep the ball moving.