Remove conditional compilation test from the volatile data code