attempt #2
... aaand it works. Hooray. Everyone wins!
Merge branch 'master' into attempt2
Attempt 2 made much more sense than attempt 1, so we're making this master.