Revert 427b428..ed447e8

This rolls back to commit 427b428af1ea8c3ff9573a4a550f3f12fc4ed3b2.