Revert 82df9fb..3feaad3

This rolls back to commit 82df9fba73141c0f4b9fb3e111da5d206b1fdad2.