Revert 6cdfb91..cf2f8d4

This rolls back to commit 6cdfb9121426e657c5d4bfcedfbe45a7e332568e.
Revert cf2f8d4..51184a3

This rolls back to commit cf2f8d433799f8e79d318c808fe3527efa9b10ad.