Revert cdc6d01..bfc9573

This rolls back to commit cdc6d0161f31f5a2b76d3c7ec09d26f776fdcb4c.