Revert 28ead2a..4c0c0b2

This rolls back to commit 28ead2a2698b2da704c3b4f086561ff7c8e55b0d.