Revert 9c6c51a..778c4b6

This rolls back to commit 9c6c51a96bc6472b3a1411bc1552da48c4fc2a79.