Revert "Merged from keebs add-dockerfile branch"

This reverts commit b33f4a19dbf747595ab23dafac82cd86b6de674a.