Revert 383c3e1..873b6c3

This rolls back to commit 383c3e14b00f2d97d6eb5f9b58885d15c8037f04.