Revert 61edf9d..db9f02c

This rolls back to commit 61edf9d6467c0b46fa8909c1d17863f1898030d4.