Revert 6f9cccc..02b8ba7

This rolls back to commit 6f9ccccca471fefcc93985de9ce416998fc8d627.