Revert 7277403..eaf2f84

This rolls back to commit 72774038357214d9e1c67a06852bfe1db6ba8355.