Revert 7fcd2ad..0bbb53f

This rolls back to commit 7fcd2adee8120ba5eb08c964f3ce7f11626d7adc.