Revert 8480e40..ba6f105

This rolls back to commit 8480e40cd28d1208835e6ab4e9308e7552a1fe12.
updates