Revert b7249b8..46d2699

This rolls back to commit b7249b81e6b88599dbdb375446b2678918da498a.