Revert 3ffccf4..39989d7

This rolls back to commit 3ffccf4872aa65de5ac41fdf38aceee60feb15d4.