Revert b2d3684..f44717d

This rolls back to commit b2d36844bdd5e3f1d8954d15eb9aaf4ad349d04a.
Version