Revert 1879d78..5f57b9c

This rolls back to commit 1879d78c1b1d14a601b7d0b231e2bdee12576ed1.