Revert 2d6870b..3241633

This rolls back to commit 2d6870ba2eba079560ea52ef920102639a6419ca.
Revert "Revert 2d6870b..3241633"

This reverts commit 9bd90e5c8b813148544cbe79205db5b104e7dc17.