Revert "patch1 (5042467)"

This reverts commit 172f5568159e29fedd97527a24fe34695e767e8c.