Revert fb61cbc..2499cee

This rolls back to commit fb61cbc31df6f8c5d7cc604d32e49ddbec19eb20.