Getting rid of the over-engineering from the previous commit.