Revert 0afc39a..16d2397

This rolls back to commit 0afc39a3080b15baa2f94a9a01b9dc421991d8f6.