Revert 2802223..caa5c4f

This rolls back to commit 28022234481ca081106d8335216285a1081a683b.