Revert 3b6e4fb..2ee9c16

This rolls back to commit 3b6e4fbe518b1267d74ab61e1e8d5220ab4a2743.