Partial revert of previous commit (two files were erroneously included)