Revert 050c5b1..d2766e3

This rolls back to commit 050c5b10ae0a084aa97639d9a09b2105f9409a5d.