Revert changeset 2726. Needs #ifdef magic.