Revert 536fe6c..7387a8d

This rolls back to commit 536fe6cb4ad59c8c9f5d92d920dbb4e0f36903ab.