Revert a0c9570..013e5fd

This rolls back to commit a0c95704799fdd89036573a7252142f637034c6c.
iljk