Revert 5fbc1e5..9713545

This rolls back to commit 5fbc1e5eff415436d41802bee8c44b19e81bdca5.