Revert "Merge pull request #296 from wlach/1108831"

This reverts commit 4bf71f4ef604401259c8d2e87afd1fe30cbec95b, reversing
changes made to f173254fd71acd1cf7a6cbf7bb96a9139930808b.