Revert 4fc85cd..e262f16

This rolls back to commit 4fc85cd12b60bee735b7c2a42b9b0c2f3a72fca5.
0905