Revert 8d75d13..19c0592

This rolls back to commit 8d75d136f70f24d2e4e8487da6b892480f9c998f.
recovery