Revert 1bef845..994c5e1

This rolls back to commit 1bef845ebb788d5d6702cac84dadc4eff5c9087a.