Revert 9b20310..77f52a1

This rolls back to commit 9b20310fabd6777f7c9800b085ae7ece13aa46fc.