Revert 4780ff6..f430f58

This rolls back to commit 4780ff6c00cdc23ee6762554799994f114231233.
Revert "Revert 4780ff6..f430f58"

This reverts commit 4063058965ed7840afe9808d5f5ac4fd1317c4b7.