Revert 2cdbfee..04b4f00

This rolls back to commit 2cdbfeee969159fd8831526a24dd6e49be01d347.