Revert d792d93..cf5d459

This rolls back to commit d792d932e4071947b35d2723106c476a91ee6736.