Revert "Completed part 3 - patch 4"

This reverts commit d87388a13d13564b4bb2b060f42b5de68e743899.