Revert 55eef83..1ce9703

This rolls back to commit 55eef834acf6035cc09a2b4f16a9cab0900e0418.