Revert f2493ef..bdc69c9

This rolls back to commit f2493ef8669883fac0b9ade37c5c7e45af7b5b33.