Revert 16398f9..146d9e2

This rolls back to commit 16398f96a957afc224eca9c27dd78f56b4371545.