Revert 4157076..bf7de56

This rolls back to commit 415707624d57aa5668a21033bfecb04c054c9eeb.