Revert 0b31582..ab09ac6

This rolls back to commit 0b31582f01f6382220bbd6f64ef2cd6cdf68f4ea.