Revert 2729ed4..b47982a

This rolls back to commit 2729ed4673b002d1afd98133c0cf8829b51ef263.