Revert 491f264..becf168

This rolls back to commit 491f26437163d9e3d11b2de15b01ef83c4d66826.