Revert 9bf164f..68aaa2e

This rolls back to commit 9bf164f6dcd6586145fa60e484b949f615be036f.