Revert 6dc26ae..81996da

This rolls back to commit 6dc26aee8b0b24fba3a732961c2772191f1a98de.