Revert 626e371..043b604

This rolls back to commit 626e371f08db8f40a34b7a56051af1132270f810.