Revert 4abcf47..cac8912

This rolls back to commit 4abcf4708d82536fa29d5b9d5f15947053f976dc.