Revert efb3474..0bb5498

This rolls back to commit efb34747e26b6d99d5988c702a2cbdccdd9e8e4c.
Revert "Revert efb3474..0bb5498"

This reverts commit 3e43e42d5a7135451036d6dff88923770e281556.