Revert 8875a12..d337cf6

This rolls back to commit 8875a121c4df388cc5d0b40ea69ada6066969dd8.
Merged
Updated