Revert a4e8314..7ad9311

This rolls back to commit a4e8314e3c03899da7d7b429ae2f0b7253368b11.