Revert 47d1470..a8906c6

This rolls back to commit 47d147009c6b7ff3233256a98ee701c39534df86.