Revert 39ef6e9..3387ebc

This rolls back to commit 39ef6e9bd6b93bc298816e8ee903acdf47da2e0b.