Revert 897bf42..fe322c2

This rolls back to commit 897bf42a4385736f255a5062fc5561eec744ef2d.