Revert ee08143..d1d2797

This rolls back to commit ee08143a793d03fc725df0f484e25a6650afd979.