Revert "Finished task 696"

This reverts commit 8965774ca96329284051a59e1d06e785de14643b.