Revert a669d32..16399c9

This rolls back to commit a669d322e3e9bb5b8bb92971963a8d910b73d7a0.