Revert dd4c7be..972eba1

This rolls back to commit dd4c7be045fc4bbc3151193cbb32bcf54fca7a9c.