Revert 14c2938..ec4ba89

This rolls back to commit 14c2938d62378e23e799b50bca3b9ea8a3fd1f36.