Revert 6d38e77..73f7b0a

This rolls back to commit 6d38e777ef798510c3047f7c59276ff917de39c4.