Revert 024329a..568528a

This rolls back to commit 024329a7097725483d8a6b4c3f15baaf95ec8d21.