Revert "Merge remote-tracking branch 'mrmoje/impress'"

This reverts commit 34b5c78d2eb506a0746066e1a9afa0bba5210ea8, reversing
changes made to 4920b61451adac4b45f3fd87dd0cc42606f4db51.