Revert 2cf800f..b6a5b73

This rolls back to commit 2cf800f10790bb0de50a067bd9b252cb13c97c04.