Revert c1a1490..05be47c

This rolls back to commit c1a1490cf8fc3bd700df0eca9a4e7b20bb98dbaa.