Although in the current context these two functions are heavily linked,
this may not be the case in the future, so splitting them seems like a
good idea.

They are now also toggle functions as we need to be able to restore the
previous state.