Revert bd708fe..ce969d4

Revert until we take a final decision

This rolls back to commit bd708fe51c2e517839042c0d09d67421425eca24.