Revert afc1626..e62c84a

This rolls back to commit afc1626a09426cbb0c5c0c94e56dc00abf2dca60.
patches added