Revert d53224d..169ed05

This rolls back to commit d53224dde5bb5e93e27c87e68895cf351dff4cc9.
Revert "Revert ec76ef3..fe29980"

This reverts commit ec76ef3c04ce987ba0a851e1d6aaba463ae0d38d.