Revert ba0f216..19530b9

This rolls back to commit ba0f216bdaee5ceedda49bbee52fa8778ccd2e5d.
Revert "Revert ba0f216..19530b9"

This reverts commit 9aa7e9264089ca89a5eac1dccc8b15eeec77686e.