Revert 69fd170..000f07d

This rolls back to commit 69fd170696229b29b75f07d14f1264ece31e9b33.