Revert "Temporary commit for patch. Does not compile!"

This reverts commit e79cde99da054865ad4d2becede6645e5b3dd806.