Revert 140ee10..d6e72c6

This rolls back to commit 140ee10c696828246848b702404635383e0213c4.
Revert e0cf12d..6a5732e

This rolls back to commit e0cf12d62cd5a28ece71fbd13a76a55952aa44ec.