Revert "Patch 557"

This reverts commit 7402204e002e0ad56e91d701a2342f29dca7d3f9.