Revert 3ed2a3f..143ac24

This rolls back to commit 3ed2a3f59b47fe25009ebd9e206ace7764de7daf.