Revert eebb007..ab49945

This rolls back to commit eebb007f451995a333af65eebbf782653ea9d329.
Revert "Revert eebb007..ab49945"

This reverts commit ae0af746c06724c51baa83e37738858def027873.