Revert 06ad226..877b54d

This rolls back to commit 06ad2264f438dab6df6f870ce7d787417587204b.