Revert b239276..8c8552e

This rolls back to commit b239276a41520ebb1cc8c02b437077e5245ca05c.