Revert 1468d02..da6d4e4

This rolls back to commit 1468d0223075b1cccde2521323b2d32bac7b1f85.