Revert 2ebc4cd..edffc51

This rolls back to commit 2ebc4cd91f21a2dc338d696f25f0fd8ad4ec549e.