Revert a746378..afb9572

This rolls back to commit a7463785eb37c9b32db41edc8841397395c171ea.