Revert 3d93a4a..1997ce6

This rolls back to commit 3d93a4a8f1cc305dba7afc89957843747b973580.
Revert "Revert 3d93a4a..1997ce6"

This reverts commit 524a55175ff6a15f75863a7c6c0e966c58a0a98e.