Revert #21 as we now have 2 different views