Revert 6e57683..59f261c

This rolls back to commit 6e57683158659f823955e12cc8e3cee4c6d5de51.