Revert dd5cb8f..61f9e04

This rolls back to commit dd5cb8f68dabd6a1f1b9c256a98e4c3c06c956da.