Revert f1ae308..9cd37ce

This rolls back to commit f1ae3086090dbf0142ebec4f2af19f3c937cdcd2.