Uncommented out part of the functionality in previous commit.