Revert 9299fad..40b3d06

This rolls back to commit 9299fadebcef50dc8dccc40080f170d7f4702ce2.