Revert 5b9bdef..304bc7d

This rolls back to commit 5b9bdefb0b60fd05d8c3004e91a2520c162700e2.
Revert "Revert 5b9bdef..304bc7d"

This reverts commit 451a9eb09fd02ac5c05295e91d751bd4c0a140c5.