Revert a30a5ef..fc7bad3

This rolls back to commit a30a5ef7e9db828ae6139fd3175975405f5a90df.
Revert "Revert a30a5ef..fc7bad3"

This reverts commit a45b617fae97bf0332838a8702e1e8713e44ea0a.