Revert 0ac54fe..10be72a

This rolls back to commit 0ac54fe7a1d3b09ed6df485eadbd534df30bdb89.
ijs