Revert "Requirement 32"

This reverts commit 6fd847b87573149b217ba8d9ff7749f9bf31a84e.