Revert part of feature that accidentally got overwritten.
Merge branch 'feature/69'