Revert 9c5ccd7..adbc3a8

This rolls back to commit 9c5ccd7df5ef02848e13f0ff85bed0e22b7be3ed.