Revert a5e6a1f..ec86d25

This rolls back to commit a5e6a1f6a9ed3a5ec4c4b551218caefdd2488faa.