Revert "Merged"

This reverts commit 1bde3ed952355b0742b1a2586893839b911bd963, reversing
changes made to c5b9e44dcb08844f0802155fb9299211778a7c83.